[Bf-blender-cvs] [229c2c1] master: Fix crash in project-from view without a brush or active object

[Campbell Barton]

Commit: 229c2c14f796b9d446301d9b0b8091c5e8a4f2ab
Author: Campbell Barton
Date:   Wed Sep 10 23:02:31 2014 +1000
Branches: master
https://developer.blender.org/rB229c2c14f796b9d446301d9b0b8091c5e8a4f2ab

Fix crash in project-from view without a brush or active object

===================================================================

M       source/blender/editors/sculpt_paint/paint_image.c
M       source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image.c 
b/source/blender/editors/sculpt_paint/paint_image.c
index ebfb17d..7c19528 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -591,11 +591,12 @@ static Brush *image_paint_brush(bContext *C)
 
 static int image_paint_poll(bContext *C)
 {
-       Object *obact = CTX_data_active_object(C);
+       Object *obact;
 
        if (!image_paint_brush(C))
                return 0;
 
+       obact = CTX_data_active_object(C);
        if ((obact && obact->mode & OB_MODE_TEXTURE_PAINT) && 
CTX_wm_region_view3d(C)) {
                return 1;
        }
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c 
b/source/blender/editors/sculpt_paint/paint_image_proj.c
index ef4a4e9..0fb3e27 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4541,7 +4541,8 @@ static void project_state_init(bContext *C, Object *ob, 
ProjPaintState *ps, int
        if (ps->tool == PAINT_TOOL_CLONE)
                ps->do_layer_clone = (settings->imapaint.flag & 
IMAGEPAINT_PROJECT_LAYER_CLONE) ? 1 : 0;
 
-       ps->do_stencil_brush = ps->brush->imagepaint_tool == PAINT_TOOL_MASK;
+
+       ps->do_stencil_brush = (ps->brush && ps->brush->imagepaint_tool == 
PAINT_TOOL_MASK);
        /* deactivate stenciling for the stencil brush :) */
        ps->do_layer_stencil = ((settings->imapaint.flag & 
IMAGEPAINT_PROJECT_LAYER_STENCIL) &&
                                !(ps->do_stencil_brush) && ps->stencil_ima);
@@ -4660,15 +4661,15 @@ static int texture_paint_camera_project_exec(bContext 
*C, wmOperator *op)
        IDProperty *view_data = NULL;
        Object *ob = OBACT;
 
-       paint_proj_mesh_data_ensure(C, ob, op);
-
-       project_state_init(C, ob, &ps, BRUSH_STROKE_NORMAL);
-
-       if (ps.ob == NULL || ps.ob->type != OB_MESH) {
+       if (ob == NULL || ob->type != OB_MESH) {
                BKE_report(op->reports, RPT_ERROR, "No active mesh object");
                return OPERATOR_CANCELLED;
        }
 
+       paint_proj_mesh_data_ensure(C, ob, op);
+
+       project_state_init(C, ob, &ps, BRUSH_STROKE_NORMAL);
+
        if (image == NULL) {
                BKE_report(op->reports, RPT_ERROR, "Image could not be found");
                return OPERATOR_CANCELLED;
@@ -4869,6 +4870,8 @@ void paint_proj_mesh_data_ensure(bContext *C, Object *ob, 
wmOperator *op)
        Main *bmain = CTX_data_main(C);
        Brush *br = BKE_paint_brush(&imapaint->paint);
 
+       BLI_assert(ob->type == OB_MESH);
+
        /* no material, add one */
        if (ob->totcol == 0) {
                Material *ma = BKE_material_add(CTX_data_main(C), "Material");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs