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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-18 18:39:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-18 18:39:51 +0300
commitf828355cd6ccea84ea699ee524ca56f9bdd2f997 (patch)
tree1457a60efb26ba4bf99f9d16cf243f794869ebc4 /source/blender/editors/physics
parentd7122825ecbe12d6bf031ca5e1aa17a46b8fd01f (diff)
Avoid assert on startup
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index a4225e86a6e..66369d989be 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4669,9 +4669,14 @@ void PE_create_particle_edit(
psys = NULL;
}
+ /* Causes assert on startup. */
+#if 0
UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
-
+#else
+ memset(edit->sel_col, 0xff, sizeof(edit->sel_col));
+ memset(edit->nosel_col, 0x00, sizeof(edit->nosel_col));
+#endif
recalc_lengths(edit);
if (psys && !cache)
recalc_emitter_field(depsgraph, ob, psys);