Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-05-02 13:26:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-05-02 13:26:59 +0400
commitf65dcfc6d9ac241ab15c383558d14390127249b1 (patch)
tree47dddbefc7f1b1c672611021d91fe7f771ad2961
parent6416979b4598cdfddde2b916c01291a88bb7249a (diff)
Fix T39989: Dupli group's objects in Particles are not displayed properly in 3D View
It was broken in 7544961 and the proper way is to make sure proper obmat is being copied to object before the draw. Doing obmat copy in advance doesn't really work because object might appear multiple times in the duplilist.
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index bcde630e270..89bdf4df5ac 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2076,6 +2076,7 @@ static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Bas
}
}
else {
+ copy_m4_m4(dob->ob->obmat, dob->mat);
draw_object(scene, ar, v3d, &tbase, DRAW_CONSTCOLOR);
}