← Back to branch summary

~bf-translators/blender/garlic

~bf-translators/blender/garlic

« back to all changes in this revision

Viewing changes to source/blender/editors/space_image/space_image.c

Committer: nazgul
Date: 2011-09-20 12:01:16 UTC
Revision ID: svn-v4:954f8c5b-7b00-dc11-b283-0030488c597c:branches/soc-2011-garlic:40393

Merging r40366 through r40392 from trunk into soc-2011-garlic

files modified:
GNUmakefile

build_files/cmake/cmake_static_check_splint.py

build_files/scons/config/win64-vc-config.py

doc/python_api/sphinx_doc_gen.py

intern/smoke/CMakeLists.txt

release/scripts/startup/bl_ui/properties_data_mesh.py

release/scripts/startup/bl_ui/properties_material.py

release/scripts/startup/bl_ui/space_info.py

release/scripts/startup/bl_ui/space_view3d.py

release/scripts/startup/bl_ui/space_view3d_toolbar.py

source/blender/blenkernel/BKE_armature.h

source/blender/blenkernel/BKE_blender.h

source/blender/blenkernel/BKE_image.h

source/blender/blenkernel/BKE_material.h

source/blender/blenkernel/BKE_mesh.h

source/blender/blenkernel/BKE_paint.h

source/blender/blenkernel/intern/DerivedMesh.c

source/blender/blenkernel/intern/anim_sys.c

source/blender/blenkernel/intern/armature.c

source/blender/blenkernel/intern/blender.c

source/blender/blenkernel/intern/cdderivedmesh.c

source/blender/blenkernel/intern/customdata.c

source/blender/blenkernel/intern/image.c

source/blender/blenkernel/intern/material.c

source/blender/blenkernel/intern/mesh.c

source/blender/blenkernel/intern/node.c

source/blender/blenkernel/intern/paint.c

source/blender/blenkernel/intern/sound.c

source/blender/blenkernel/intern/subsurf_ccg.c

source/blender/blenloader/intern/readfile.c

source/blender/collada/GeometryExporter.cpp

source/blender/collada/GeometryExporter.h

source/blender/collada/MeshImporter.cpp

source/blender/collada/MeshImporter.h

source/blender/editors/armature/editarmature.c

source/blender/editors/armature/meshlaplacian.c

source/blender/editors/include/ED_mesh.h

source/blender/editors/include/ED_view3d.h

source/blender/editors/interface/interface_templates.c

source/blender/editors/interface/view2d.c

source/blender/editors/mesh/editmesh.c

source/blender/editors/mesh/editmesh_mods.c

source/blender/editors/mesh/mesh_data.c

source/blender/editors/mesh/meshtools.c

source/blender/editors/object/object_intern.h

source/blender/editors/object/object_ops.c

source/blender/editors/object/object_vgroup.c

source/blender/editors/sculpt_paint/paint_image.c

source/blender/editors/sculpt_paint/paint_intern.h

source/blender/editors/sculpt_paint/paint_ops.c

source/blender/editors/sculpt_paint/paint_utils.c

source/blender/editors/sculpt_paint/paint_vertex.c

source/blender/editors/sound/sound_ops.c

source/blender/editors/space_action/action_select.c

source/blender/editors/space_image/space_image.c

source/blender/editors/space_logic/logic_ops.c

source/blender/editors/space_nla/nla_select.c

source/blender/editors/space_node/drawnode.c

source/blender/editors/space_node/node_edit.c

source/blender/editors/space_node/node_select.c

source/blender/editors/space_node/node_state.c

source/blender/editors/space_outliner/outliner_edit.c

source/blender/editors/space_outliner/outliner_tree.c

source/blender/editors/space_sequencer/sequencer_edit.c

source/blender/editors/space_text/text_draw.c

source/blender/editors/space_view3d/drawmesh.c

source/blender/editors/space_view3d/drawobject.c

source/blender/editors/space_view3d/drawvolume.c

source/blender/editors/space_view3d/space_view3d.c

source/blender/editors/space_view3d/view3d_edit.c

source/blender/editors/space_view3d/view3d_header.c

source/blender/editors/space_view3d/view3d_select.c

source/blender/editors/space_view3d/view3d_view.c

source/blender/editors/transform/transform.c

source/blender/editors/transform/transform_conversions.c

source/blender/editors/transform/transform_manipulator.c

source/blender/editors/transform/transform_ops.c

source/blender/editors/uvedit/uvedit_ops.c

source/blender/gpu/GPU_draw.h

source/blender/gpu/GPU_material.h

source/blender/gpu/intern/gpu_draw.c

source/blender/gpu/intern/gpu_material.c

source/blender/makesdna/DNA_material_types.h

source/blender/makesdna/DNA_mesh_types.h

source/blender/makesdna/DNA_meshdata_types.h

source/blender/makesdna/DNA_object_types.h

source/blender/makesdna/DNA_scene_types.h

source/blender/makesrna/intern/rna_curve.c

source/blender/makesrna/intern/rna_material.c

source/blender/makesrna/intern/rna_mesh.c

source/blender/makesrna/intern/rna_nodetree.c

source/blender/makesrna/intern/rna_object.c

source/blender/makesrna/intern/rna_scene.c

source/blender/modifiers/intern/MOD_uvproject.c

source/blender/nodes/composite/node_composite_util.h

source/blender/nodes/composite/nodes/node_composite_colorSpill.c

source/blender/nodes/composite/nodes/node_composite_diffMatte.c

source/blender/nodes/intern/node_common.c

source/blender/render/intern/source/convertblender.c

source/blender/render/intern/source/pixelshading.c

source/blender/render/intern/source/pointdensity.c

source/blender/render/intern/source/render_texture.c

source/blender/render/intern/source/rendercore.c

source/blender/render/intern/source/shadeoutput.c

source/blender/render/intern/source/zbuf.c

source/blender/windowmanager/intern/wm_gesture.c

source/gameengine/Converter/BL_BlenderDataConversion.cpp

source/gameengine/Ketsji/BL_BlenderShader.cpp

source/gameengine/Ketsji/BL_BlenderShader.h

source/gameengine/Ketsji/BL_Material.cpp

source/gameengine/Ketsji/BL_Material.h

source/gameengine/Ketsji/KX_BlenderMaterial.cpp

source/gameengine/Ketsji/KX_BlenderMaterial.h

source/gameengine/Ketsji/KX_PolygonMaterial.cpp

source/gameengine/Ketsji/KX_PolygonMaterial.h

source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp

source/gameengine/Rasterizer/RAS_IPolygonMaterial.h

source/gameengine/Rasterizer/RAS_IRasterizer.h

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h

Show diffs side-by-side

added added

removed removed

source/blender/editors/space_image/space_image.c

595

595

596

596

tf = EM_get_active_mtface(em, NULL, NULL, 1); /* partially selected face is ok */

597

597

598

if(tf && (tf->mode & TF_TEX)) {

598

if(tf) {

599

599

/* don't need to check for pin here, see above */

600

600

sima->image= tf->tpage;

601

601

Older »